Ignore src/macuvs.h and IVD_Sequences.txt for now
authorRob Browning <rlb@defaultvalue.org>
Wed, 22 Oct 2014 00:12:09 +0000 (19:12 -0500)
committerRob Browning <rlb@defaultvalue.org>
Wed, 22 Oct 2014 00:12:14 +0000 (19:12 -0500)
Add 0007-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch to
avoid trying to build src/macuvs.h (via IVD_Sequences.txt) since we
removed it for the time being, due to uncertainty over the licensing.

1  2 
debian/.git-dpm
debian/patches/0007-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch
debian/patches/series

diff --cc debian/.git-dpm
index 761c3200c3427e0ac6e34d6c6cef7bc66e64d64e,0000000000000000000000000000000000000000..9a83196b2c1908cb7786eea62410badad7ac87d3
mode 100644,000000..100644
--- /dev/null
@@@ -1,8 -1,0 +1,8 @@@
- 8adcb1e0139fcd29a68b0ea8746090f97c3fe0f0
- 8adcb1e0139fcd29a68b0ea8746090f97c3fe0f0
 +# see git-dpm(1) from git-dpm package
++5500d3a801260a01699a1308167237cc473a3e93
++5500d3a801260a01699a1308167237cc473a3e93
 +fa54b24bfb46d6799598ccd7639c5ad7c02df252
 +fa54b24bfb46d6799598ccd7639c5ad7c02df252
 +emacs24_24.4+1.orig.tar.bz2
 +b73323c62f01f42ddf6c57eada1a4f58cf0806e1
 +24395968
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..e7b1c61ea21efe92c0ebace224d56b39df523f0c
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,37 @@@
++From 5500d3a801260a01699a1308167237cc473a3e93 Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Tue, 21 Oct 2014 19:10:17 -0500
++Subject: Don't try to build src/macuvs.h (via IVD_Sequences.txt)
++
++These are OS X specific, and were removed for now, due to uncertainty
++over the licensing.
++---
++ admin/unidata/Makefile.in | 8 +-------
++ 1 file changed, 1 insertion(+), 7 deletions(-)
++
++diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in
++index 3074864..3ad81a9 100644
++--- a/admin/unidata/Makefile.in
+++++ b/admin/unidata/Makefile.in
++@@ -33,12 +33,7 @@ emacs = "${EMACS}" -batch --no-site-file --no-site-lisp
++ 
++ .PHONY: all compile install
++ 
++-all: ${top_srcdir}/src/macuvs.h ${DSTDIR}/charprop.el
++-
++-${top_srcdir}/src/macuvs.h: ${srcdir}/uvs.el ${srcdir}/IVD_Sequences.txt
++-     ${EMACS} -batch -l "${srcdir}/uvs.el" \
++-       --eval '(uvs-print-table-ivd "${srcdir}/IVD_Sequences.txt" "Adobe-Japan1")' \
++-       > $@
+++all: ${DSTDIR}/charprop.el
++ 
++ .el.elc:
++      ${emacs} -f batch-byte-compile $<
++@@ -87,7 +82,6 @@ maintainer-clean: distclean
++ ## change and it slows down bootstrap (a tiny bit).
++ ## Cf leim/ja-dic (which is much slower).
++ extraclean:
++-     rm -f ${top_srcdir}/src/macuvs.h
++      if test -f ${DSTDIR}/charprop.el; then \
++        (cd ${DSTDIR} && rm -f `sed -n 's/^;; FILE: //p' < charprop.el`); \
++        rm -f ${DSTDIR}/charprop.el; \
index f53b4df9a63d25045f7cb4193ef7379efcc701d8,0000000000000000000000000000000000000000..2708556d91738324a9a9106435ce1b67ba758007
mode 100644,000000..100644
--- /dev/null
@@@ -1,6 -1,0 +1,7 @@@
 +0001-Prefer-usr-share-info-emacs-24-over-usr-share-info.patch
 +0002-Run-debian-startup-and-set-debian-emacs-flavor.patch
 +0003-Remove-files-that-appear-to-be-incompatible-with-the.patch
 +0004-Adjust-documentation-references-for-Debian.patch
 +0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch
 +0006-Look-for-NEWS-in-order-to-find-etc-rather-than-GNU.patch
++0007-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch